removed commented out line and a little clean up