KAA-257: take into account code style comments