List updates

Minor refactors, optimized methods, better test coverage.