Making more functions "top-level"