Cleanup based on rails best practices