cleanup, make code more readable