refactoring startup/shutodown - part 2