Tweaks + short circuit on class modifier