Update normalize and cleanup
Major update to support Rails 4.2