Standardize formatting and use cached selectors