Closes #1

* Also fixed some phpcs