Reformatting

This makes our code new comply with the PSR2 code style