Fixed commenting style to maintain consistency. Fixed warnings and fully
implemented the java coding style.