cleaned up more comments