ditch commands, roll them into call statements