update code style of 3 classes, #37