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