Tidyin' the codes