Code Review

All sorts of imports are tested and verified. Some code bloat has been
eliminated.