formating cleanup, small refactoring