can we swap the `== nil` for `.nil?` for consistency. Also on line 303.