f readability improvements from val