JeffGoyette:Updated some comments and moved a method