make code neater