cleaned up and reduced size