* Code clean-up
* Some PHPDoc and other comments