Cleaned up code to be consistent, inc. adding docblocs, using PSR naming conventions & typos

Docblocs benefits:
- IDE auto complete gives info on type etc
- Auto documentation on CI