update to PSR1-2 + phpDoc fix