Added some formatting fixes after reunion