Bit of cleanup, this is in dire need of an update.