Code cleanups.
Made some feature types dense.