Reformatting

Hopefully last formatting commit..