Minor refactoring. Increase code readability.