Ben cleaned up code a bit.