Fix Checkstyle Issues pt
Merge remote-tracking branch 'cortiz/master'