Slightly improve readability and test coverage