case fix
cleanup