Changes according Dominic's review notes:
- more informative summary text
- code formatting
- FIXME comments added