clean up & add crate