small cleanup, update vayu routines