minor refactoring due to style