cleanup & simplify