Remove get_next_char, change variables