changed single line return into expression bodies