Project 3

Code simplifications for some returns