- cosmetic refactoring to improve readability