Remove TODO comment, now done
Extract variables
Update comment
Add a couple of comments to help me understand.