Normalising return statements