refactor manager code

before I'm going to add more complexity