chore (global): Code refinements