- A bit of refactor to standardize.