simplify, cleanups