Made code more butiful