Revert guava update and fix some formatting