Made code more concise