Reformatting

This makes our code comply with the PSR2 code style