Be a bit more functional