Tidy up formatting and kill those last warnings