Merge pull request #983 from krivera-pentaho/dev

Made modifications in accordance to checkstyles
Corrected warnings and checkstyles issues