better method name
cleanup