- a bit more idiomatic
- removed guava jars