KAA-40: take into account code style comments