make code more neat