Cleaning up utility code.