Massive code reformat (forgot to do on-commit)