PIM-2558: Add phpdoc and clean class