Reorder lines
Cleanup spec helpers
Remove Gemfile.lock
Clean up styles