improves names of some variables
removes useless is_additive function