make code more clean