phpDoc and some tiny cleanup