fix syntax, simplify scheme

fix syntax error
ensure scheme is set in both types
simplify scheme definition