reorg/format updates, compiles with no warnings/errors