Little bit of smoothing
Clean up the commented out stuff finally