Minor code improvements/tweaks.