started cleaning up; reformat, added guava, removed commons codec