refactoring for code conventions