cleaned up some repetitions