Organized output better and gave extra names to be more clear on minute distinctions