Cleaned up print outs to match assignment requirements

Also deleted some of the blocks of commented code but have a back up in case anyone complains.