class rename
cleanup, move to ArrayList as it is lighter and has better indexed access
Test coverage
deleted