Some cleanup/tweaks