FIxing checkstyle violations