Reorder to keep data and routines separate and to keep a couple of