Cleanup

Just some more clean up and whitespace removal. Also attempting to fix
an issue with PHP-FPM