Performed a bit of cleanup.