Update for psr-4
Clean up doc blocks