Moar boilerplate
Some cleanup to the PHP