More cleaning up
More touchups