Refactorof callout style