Add a couple of comments explaining decisions