Clean up code consistency