checking in james' latest formatting changes