Remove debugging leftover & small phpdoc cleanups
Whitespace cleanups