A tiny bit of refactoing for clarity