Updates based on feedback

Thanks @SimonSapin :)