PhpDoc and some cleanup