Simple cleanup and moving towards simple_form_for