address review comments

https://critic.hoppipolla.co.uk/showcomment?chain=8793
https://critic.hoppipolla.co.uk/showcomment?chain=8794