minor tweaks + cleanup