Cleans thing up a bit.