A couple small clean ups