Fixed Issue: PHPDoc cleanup