More code refactoring