Make functions nicer