[#444] Fixing checkstye violations