Nice refactoring. More clean and readable.