Fixing CS, adding phpdoc