Clean up, consistency