#49 reformat
#49 minor refactoring