minor cleanup on codes in model