fix property name, cleanup, simplify