Code clean-up of engine.rb
Code clean-up in site.rb