Minor tidy ups

Minor tidy ups