General cleanup and adding in Google Guava.