chore(global): cleanup & harmonize