Fixes engine.rb to call activate for decorators.

Also begins cleaning up the code formatting.