Tidied up code.
  - Consistent array style (square brackets)
  - Always uses braces on conditions
  - Removed some dead code.
Merge pull request #28 from HippoPHP/small-cleanup

Tidied up code.