GTWII-244 Solved checkstyle violations