minor refactoring for coding conventions