make code cleaner