simplified internals, improved consistency
removed ancient debugging remnants