Cleaning up to simplify plus some content.