Solved checkstyle errors and some other inspection recommendations.
Merge remote-tracking branch 'origin/master'