Oops, autoformat, minor fixes