clean verb actions; some moved to separate functions