Upgrade Rails version + minor cleanup