make it dry
cleanup