Code Tweaking

Very minor tweaks.