cleanup & simplification