Fixing error on return sintax and creating comments