stripped back and cleaned up.