Minor coding style fixes across models

* Removed unused variables
* Removed unnecessary return statements
* Fixed formatting on Hashes