Improved readability and type safety.