Use more idiomatic functions :koala: