Minor, but since these two last lines probably should be indented as they are part of one &&