Just a little more cleanining up.