Case form refactoring