builder cleanup
mainly phpdoc