clean up phpDoc and use-statements