Refactor code into one-liners where appropriate
Upgrade gems