Clean up utility method