Make functions a bit more idiomatic