more commenting, refactoring on manager classes