* Basic refactoring
* Fixed failing rails best practices violations