Refactor

Manager constructor, method rationalisation