[READY] some cleanup

This PR:

- cleans up a bit and set repo to PSR4 and fixed some typos