Clean up some repetition