Refactor to improve readability
Space