polish, harmonize, not use macro anymore