* fix CS to PSR-2 and removed hungarion notation