Added PSR-2 compliance