Made code more readable