Taking care of @adamrp suggestions