Move offsetting if statement into scopes