Removed some repetition