Cleanup: formatting & commented-out kruft