Try to fix horrendous formatting (almost, I swear!)