simplify code
cleanup