Some other refactoring