clean up some repetition