moved HandleScope where it should be, minor style fixes
retab