TINS-144 QA 0.2.0 : fixed some CheckStyle and PMD issues