Tidying

Removed some of WordPress' annoying PHP style and cleaned up a little