refactoring to for clarity