Minor changes

Made changes to minor things pointed out by Andrew after a code review