FIX: changed style to PSR-2