curly brace style
remove isNone() nonsense