* code fixes (PSR compatibility)