clean up & add guava