Cleaning up, adding PHP 5.6