Clean up formating, #5