Started converting to a more idiomatic lens style