minor changes cleaning up commented out code