Making code neater