minor refactoring
fix formatting