Little bit of refactoring
Removed return statement