Minor clean up to make code more readable