General Cleanup

This makes all php files a lot nicer to
look at and work with

Change-Id: I5626f449e3192f7de59a05f8c61b4f0e48c048d2