coding convention refactoring