Minor ocd cleaning of the codes