Delete commented-out code.
More shortening with inner classes; things now work