Made code little cleaner