Clean up utility module code