- cleanup (comments, finality etc.)
- better documentation