Refactoring fixes