Sort out the code formatting