Fixes return statements

- removes void returns
- removes new lines before returns