Fix code consistency - make it easier to read