Applied (most of) the comments