cleanup & add compression