Gotta clean up code a bit.