Release 2 final code

This is the final code with CheckStyle changes.