Refactoring useless return line
Removing echo