simplify code
simplify code
simplify code
simplify code
simplify code
simplify code
cleanup directory