Cleaned up for rails scaffolding