regular code refactoring work