Module works
Cleanup and phpdoc