cleaning up commented code