cleanup/tweaking