Minor clean up: