Made code more beautiful