* Streamline main callflow rules array rebuild * Indent control flow correctly * Streamline call entities adaptor