fix syntax, simplify scheme