more formatting and remove commented out code