Compact case list and refactoring
Merge branch 'compact'