refactor & reindent some manager