Small clean up to be more readable