Decorators now pass initialize() and takeDown()

renamed some vars in main