Made code neater