Updates print statements and uses better var names