Fixup, more readable code