comments and some initializer refactoring