enum actually scoped + small change