Use more idiomatic function declarations