Syntax tweaks
Remove unnecessary invariant