simplify, cleanup