Do small code refactoring