Further cleanup and changes.