Cleaning up cs errors

Cleaned up some of the biggest troubled files in the phpcs scan