Refactoring. A little bit more.