A couple small changes
mild refactor