minor refactoring

also indentation change :(