Global refactoring. PSR-2 compliance.