Refactoring. Code formatting.