Made code more clear