clean up and lint