fixes due to code review: remove guava dependency; minor cosmetic fixes