Make some stylistic code layout changes