Cleanup code, cleanup PHPDoc