Made code neater.