Made the return-from function a bit cleaner