Ident files, remove unnecessary returns and made some minor refactors

Hi guys,

This pull request does the following:
* Remove empty lines
* Remove trailing spaces
* Remove unnecessary returns
* Use ||= to memoize instance variables
* Indent the files
* Really small refactor in methods

I did it in order to make the code more readable :smiley: 

Thanks!