Make code refactoring