Updated formatting of routines