Refactor code for clarity and maintainability