update code style of 7 classes, #37
update code style of 6 classes, Closes #37