Clean up for consistency