code cleanup and moved common properties to Controller superclass