Cleaning up a bit and making final commit.