Fixes follow by Rails best practices