Tried cleaning this thing up a bit.