Minor tidy up here and there