Modify routine format

Change-Id: Id57bf8f6c82e2ad27dc315dda7f3937ac8e51951