Fixed potential None error in make_text
cleaned up comments