Refinement of the specification, missing scenarios
polishing:
- remove unnecessary vars/parameters
- organize imports
cleanup (remove a dead test, remove unused parameter)