Fixed issue: Cleanup code, cleanup PHPDoc
Merge pull request #539 from sergeyklay/fix-html

Cleanup code, cleanup PHPDoc