fix code style according to comments, refs #27