minor refactoring - style issues