Upgrade to guava 17
Code optimization