Fix some repetition issues