clean up code consistency