Fixed many small phpcs issues

This pr fixes many small phpcs issues
Oh didn't know about that code convention @stof! Reverted those changes, but that's indeed something we should try to get according the PSR-2 standards in the future!