Formatted code to Google Java style
Added code for modules
Generified collections