Small Tweaks

Just a couple small tweaks in the solution.