Agree with all decisions here except for trailing whitespace