Refactoring further