Refactor style correlator for readability