Small Tweaks

Some small changes while reviewing code.