Making some code changes based upon feedback