Refactoring further.