This is really minor but previously "good" code came first and "bad" code came second. Can we switch these statements for continuity.