Formatting (again!) 'cos my Eclipse formatter was a bit dodgy