Handling scope vars better + return/break/continue