comments and some initializer refactoring
comments and some initializer refactoring