Did some cleanup after the inital commit.