cleaning up more comments