Remove some leftovers
Fix PHP 5.3 compatability
Fix formatting