General cleanup  to make code more readable