Cleaning the code up a little to remove unnecessary commented lines.