addressing some CR feedback, cleaning up commented code