Just needs a few validations and cleanup

I like check_city. This is a great solution for simplifying things in the update and create methods.