clean-up

made code more readable