Fixes engine.rb to call activate for decorators.  Also begin to cleanup code formatting.