392.33 cleanup, documentation and some code consolidation and naming