Deleted commented out code and did some minor code reformatting.