Initial code tidy :oS