Phpdoc

- Code cleanup
- Phpdoc