Removed some new lines before return statements