Small clean up and addition